Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync branches when mirroring #25722

Merged
merged 2 commits into from
Jul 6, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Jul 6, 2023

Caused by #22743

@lunny lunny added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jul 6, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 6, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 6, 2023
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 6, 2023
@@ -359,7 +358,7 @@ func configSetNonExist(key, value string) error {
func configAddNonExist(key, value string) error {
_, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key, regexp.QuoteMeta(value)).RunStdString(nil)
if err == nil {
// already exist
// already exist ,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's editors behaviour.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But there are lots of spaces and a ,

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 6, 2023
modules/git/git.go Outdated Show resolved Hide resolved
@wolfogre wolfogre added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 6, 2023
@silverwind silverwind merged commit 45ac90e into go-gitea:main Jul 6, 2023
@GiteaBot GiteaBot added this to the 1.21.0 milestone Jul 6, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 6, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 7, 2023
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Remove unused code (go-gitea#25734)
  Fix commits table regression (go-gitea#25710)
  Fix inconsistent user profile layout across tabs (go-gitea#25625)
  Simplify the LFS GC logger usage (go-gitea#25717)
  Allow/fix review (approve/reject) of empty PRs (go-gitea#25690)
  Correct permissions for `.ssh` and `authorized_keys` (go-gitea#25721)
  Sync branches when mirroring (go-gitea#25722)
@lunny lunny deleted the lunny/sync_branches_when_mirroring branch July 7, 2023 15:46
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 4, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants